Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 6 Jul 2010 12:12:41 +0000 (12:12 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 6 Jul 2010 12:12:41 +0000 (12:12 +0000)
commitb1022e6af7b4b30ca2a329954d7a4839e522bb47
tree64860a79cb5df89af77c4b2051962600c6cd25d0
parentb3ae0496e8a04545f8e6f873dcb8196541c53769
parent54b42054d2c6ec43a77b229a2e2587590af26fdf
Merge from mainline.